From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 16 Dec 2008 12:00:25 +0000 (+0000)
Subject: mini-os: Make utility function get_self_id() in fs-front.c public.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14026^2~17
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=c32ea44041119db8f3b37b90260acb7b8200dc42;p=xen.git

mini-os: Make utility function get_self_id() in fs-front.c public.

Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
---

diff --git a/extras/mini-os/fs-front.c b/extras/mini-os/fs-front.c
index 1cecab0a14..b72fadaacb 100644
--- a/extras/mini-os/fs-front.c
+++ b/extras/mini-os/fs-front.c
@@ -869,18 +869,6 @@ moretodo:
     in_irq = 0;
 }
 
-/* Small utility function to figure out our domain id */
-static domid_t get_self_id(void)
-{
-    char *dom_id;
-    domid_t ret; 
-
-    BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id));
-    sscanf(dom_id, "%d", &ret);
-
-    return ret;
-}
-
 static void alloc_request_table(struct fs_import *import)
 {
     struct fs_request *requests;
@@ -1066,7 +1054,7 @@ static int init_fs_import(struct fs_import *import)
     unmask_evtchn(import->local_port);
 
     
-    self_id = get_self_id(); 
+    self_id = xenbus_get_self_id(); 
     /* Write the frontend info to a node in our Xenbus */
     sprintf(nodename, "/local/domain/%d/device/vfs/%d", 
                         self_id, import->import_id);
diff --git a/extras/mini-os/include/xenbus.h b/extras/mini-os/include/xenbus.h
index e8de09f282..30a1c08143 100644
--- a/extras/mini-os/include/xenbus.h
+++ b/extras/mini-os/include/xenbus.h
@@ -91,6 +91,9 @@ char* xenbus_printf(xenbus_transaction_t xbt,
                                   const char* fmt, ...)
                    __attribute__((__format__(printf, 4, 5)));
 
+/* Utility function to figure out our domain id */
+domid_t xenbus_get_self_id(void);
+
 /* Reset the XenBus system. */
 void fini_xenbus(void);
 
diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c
index 7b9c35a1dc..5ed42a3da7 100644
--- a/extras/mini-os/xenbus/xenbus.c
+++ b/extras/mini-os/xenbus/xenbus.c
@@ -666,6 +666,17 @@ char* xenbus_printf(xenbus_transaction_t xbt,
     return xenbus_write(xbt,fullpath,val);
 }
 
+domid_t xenbus_get_self_id(void)
+{
+    char *dom_id;
+    domid_t ret;
+
+    BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id));
+    sscanf(dom_id, "%d", &ret);
+
+    return ret;
+}
+
 static void do_ls_test(const char *pre)
 {
     char **dirs, *msg;